From af219b818f0493efe02153cc9341b61908962061 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 22 Jun 2009 10:00:19 -0400 Subject: [PATCH] Don't force toggle size for tabular menus either --- gtk/gtkmenu.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index f67f390f6d..49d2e2319f 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -2431,9 +2431,14 @@ gtk_menu_size_request (GtkWidget *widget, priv->heights[t] = MAX (priv->heights[t], part); } - /* if the menu doesn't include any images or check items - * reserve the space so that all menus are consistent */ - if (max_toggle_size == 0 && !priv->no_toggle_size) + /* If the menu doesn't include any images or check items + * reserve the space so that all menus are consistent. + * We only do this for 'ordinary' menus, not for combobox + * menus or multi-column menus + */ + if (max_toggle_size == 0 && + gtk_menu_get_n_columns (menu) == 1 && + !priv->no_toggle_size) { guint toggle_spacing; guint indicator_size; -- 2.30.2